python-urllib3: update to 2.6.1

Fix CVE-2025-66418 and CVE-2025-66471.

Full release notes:
https://github.com/urllib3/urllib3/releases/tag/2.6.0
https://github.com/urllib3/urllib3/releases/tag/2.6.1

Drop 001-setuptools-scm-upper-limit.patch as upstream now supports
setuptools-scm v9.x.

Signed-off-by: Wei-Ting Yang <[email protected]>

diff --git a/lang/python/python-urllib3/Makefile b/lang/python/python-urllib3/Makefile
index 9595ae6c1d91bbd34b47d8f6edeee76c3ef56150..d2772022f170dcfb4a72731380a5d0fd53759adb 100644 (file)
--- a/lang/python/python-urllib3/Makefile
+++ b/lang/python/python-urllib3/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2017 OpenWrt.org
+# Copyright (C) 2007-2025 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-urllib3
-PKG_VERSION:=2.5.0
-PKG_RELEASE:=2
+PKG_VERSION:=2.6.1
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Josef Schlehofer <[email protected]>
 PKG_LICENSE:=MIT
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE.txt
 PKG_CPE_ID:=cpe:/a:python:urllib3
 
 PYPI_NAME:=urllib3
-PKG_HASH:=3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760
+PKG_HASH:=5379eb6e1aba4088bae84f8242960017ec8d8e3decf30480b3a1abdaa9671a3f
 
 PKG_BUILD_DEPENDS:= \
        python-hatch-vcs/host \

diff --git a/lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch b/lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch
deleted file mode 100644 (file)
index d8dd737..0000000
--- a/lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ea61320386d57d5654307fb19314c1bb17ceb0e8 Mon Sep 17 00:00:00 2001
-From: Trevor Gamblin <[email protected]>
-Date: Mon, 22 Sep 2025 10:37:58 -0400
-Subject: [PATCH] pyproject.toml: change setuptools-scm upper limit
-
-setuptools-scm version 9.2.0 is now available, so change the upper limit
-specified in dependencies.
-
-Signed-off-by: Trevor Gamblin <[email protected]>
-
-Backport to v2.5.0 for OpenWrt
-
-Signed-off-by: Austin Lane <[email protected]>
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,7 +1,7 @@
- # This file is protected via CODEOWNERS
- 
- [build-system]
--requires = ["hatchling>=1.6.0,<2", "hatch-vcs>=0.4.0,<0.6.0", "setuptools-scm>=8,<9"]
-+requires = ["hatchling>=1.6.0,<2", "hatch-vcs>=0.4.0,<0.6.0", "setuptools-scm>=8,<10"]
- build-backend = "hatchling.build"
- 
- [project]